From 16cfdac864f7707a90cefbcb29b185e82601b443 Mon Sep 17 00:00:00 2001 From: Martin Nordholts Date: Sun, 23 Mar 2008 18:11:11 +0000 Subject: [PATCH] typedef:ed BABL free and malloc function pointers. 2008-03-23 Martin Nordholts * babl/babl-memory.[ch]: typedef:ed BABL free and malloc function pointers. svn path=/trunk/; revision=296 --- ChangeLog | 5 +++++ babl/babl-memory.c | 8 ++++---- babl/babl-memory.h | 9 +++++++-- 3 files changed, 16 insertions(+), 6 deletions(-) diff --git a/ChangeLog b/ChangeLog index cf4e474..cbe0abf 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2008-03-23 Martin Nordholts + + * babl/babl-memory.[ch]: typedef:ed BABL free and malloc function + pointers. + 2008-03-22 Sven Neumann Applied patch from Jan Heller that introduces list and hash table diff --git a/babl/babl-memory.c b/babl/babl-memory.c index a5b407e..20f5a62 100644 --- a/babl/babl-memory.c +++ b/babl/babl-memory.c @@ -21,20 +21,20 @@ #include #include "babl-internal.h" -static void *(*malloc_f)(size_t size) = malloc; -static void (*free_f)(void *ptr) = free; +static BablMallocFunc malloc_f = malloc; +static BablFreeFunc free_f = free; static void *first_malloc_used = NULL; static void *first_free_used = NULL; void -babl_set_malloc (void *(*malloc_function)(size_t size)) +babl_set_malloc (BablMallocFunc malloc_function) { malloc_f = malloc_function; } void -babl_set_free (void (*free_function)(void *ptr)) +babl_set_free (BablFreeFunc free_function) { free_f = free_function; } diff --git a/babl/babl-memory.h b/babl/babl-memory.h index b46dcc3..b4e0d81 100644 --- a/babl/babl-memory.h +++ b/babl/babl-memory.h @@ -19,8 +19,13 @@ #ifndef _BABL_MEMORY_H #define _BABL_MEMORY_H -void babl_set_malloc (void *(*malloc_function) (size_t size)); -void babl_set_free (void (*free) (void *ptr)); + +typedef void * (* BablMallocFunc) (size_t size); +typedef void (* BablFreeFunc) (void *ptr); + + +void babl_set_malloc (BablMallocFunc malloc_function); +void babl_set_free (BablFreeFunc free_function); int babl_memory_sanity (void); void * babl_malloc (size_t size); -- 2.30.2